From dceeec3521e0dc82a31867437c530d005a0fd139 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 23 Oct 2001 16:17:15 +0000 Subject: [PATCH] remove conflict markers --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f6cee8625..4bdff1bbc9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld it instead of "search-dialog" (when getting/setting the search dialog widget). ->>>>>>> 1.2409 2001-10-05 Jakub Steiner * gtk/stock-icons/stock_broken_image.png: broken images icon -- 2.30.2